actually fixed buttons