Removed keyboard controls, added phone controls, other minor tweaks