Fix button overlap