Finish layout and routes
Finish layout and routes
(cherry picked from commit 99e1927)