Changed layouts and slight changes to keybindings