Made button and key systems more compact