changed buttons, fixed keyboard dismiss