fixed #1

Fixed some issues with edit and menu button