more work on new navbar button layout