beautify navigation
Issue  #54