Improved go button and add cancel button in modal