13/12/2013 commit
Finish layout and routes