Fixed buttons bug