Removed old gems and old style
Incremental improvement
Moving over to haml
Done for now