Remove menubar special handling
Add support for off form image buttons
Add menubar buttons to main menu