Change to Ruby1.9-style hash
Finish layout and routes