Cleanup and disabling features I don't use

Focusing on the few features I actually use.

Putting the key combos near the actual window commands. They were a bit
too absctracted before, making it difficult to see how the key command
relates to the function.