fixed buttons and shit