Remove positioning hack and change where menu...

...button is inserted. Fixes #63.