Revert "Finish layout and routes"

This reverts commit 08bf6f79204eedd4bf0a1b4ccd655e4ce9eb9efb.

Conflicts:
	Gemfile
	Gemfile.lock
Revert "Revert "Finish layout and routes""

This reverts commit 53b1a6063ab12cffe7b817554f0fc46c2c762526.