fixed buttons and updated rules