Reworked how some keys were bound