Updat dropdown, add keybindings and simplify usability