Fixed issues regarding navigation bar buttons.