Improve layout around navigation block