Finish layout and routes
Resolve merge conflicts
Resolve remaining merge conflict