improve layout and routes