Improve layout and compass indicator.