Finished layouts and routes
merging fix
fixed merge failure