buttons bug fixed