Updated navigation

See #184