Buttons and navbar fixes