Sorta getting theme in there.. more work needed
Cleaned up the template a lot, worked it into the master layout