I also think the User experience could be improved a little bit if you make the controls more homogenous. Try to use the same button to accept in all different modes and screens please :D
