Fix cancel button and some messages