Improvements of design of navigation page - #7