Fixed proper Input Button Mapping