Bugfix in Navigation Screen