Improve layout and routes