Bootstrap layout, test refactoring
Finish layout and routes