Lot's of changes to site generation!
Separated stuf to templates and did loads of changes related to that. Cowboy style!