Added buttons and menu Fixes #1