Finish layout and routes
Pre-user model commit