now fixed buttons