Minor optimization of drawing code in OSX
Revert unintended commit of menubutton file