Shrinking Option Items

Issue Summary

The new non-dhtml version of the add/edit option items is quite excessive in space usage, as it needs 3 lines for two options at the end of every bookmark block. The attached patch reduced the Add/Edit options to a single line by packing them together into a single leaf menu item.
The code probably needs more work, e.g. this shrunken version could be offered to be optionally enabled in the module settings if not deemed a generally good solution.