Fix navbar buttons
more top button fixes