Layout Changes
Finish layout and routes