Okay, I Think I'm Back on Track

The template still needs some tweaking but I managed to clean it up quite a bit.