fixed buttons, minor fixes