cleaned up views
Finish layout and routes