added in a menu and better control handling