Handle BuddyPress Nav Menu elegantly.
Make some core changes to handle the BuddyPress Navigation Menu elegantly.
Small fixes to the buttons.
Merge branch 'master' into buddypress