Switch cancel button order

And rename edit button