Corrected a couple of button mappings