Initial rewrite action.
putting things back in place
using default layout filename
styles and whatnot
fixing up layout and shit
minor
another minor
Fixing specs
better things and stuff