Fix button overlap issue