Bug 1107040 - [BB] Improve buttons on object menu