Reorganize widget locations, revert some keybinds to original