add catch on button and map