fixed buttons again