Minor updates to fix circular imports
switch to mousetrap for keybindings, remove old angular files, attempts to fix button editor