Fixed a few button mappings