Finish layout and routes
Merge branch 'master' of github.com:vimcmd/icrb