Removed Index and updated tests
Finish layout and routes