Major changes to the theme layout, merge from a side project. Still need to do most of the administration and the front end blog, but it's looking good