Change to Ruby 1.9 style hash syntax
Finish  layout and routes