Completed menu with new control

fixes #66