Contributes to #82. Navigation improvements and minor UI improvements