Adding style
Refactoring layouts and test
Finish layout and routes