Helen

fixing button-map overlap issue