Finish layout and routes
merge workspace.xml