filling layout 1
Refactor stylesheets
Refactor tests
Fix workspace
Finish layouts and routes
Add workspace
Merge branch 'filling-in-layout'

Conflicts:
	.idea/workspace.xml