Corrected overlapping button issue