Added mappings for better window management

Also added a few other tweaks and cleanup