Adjust layout and routes