Change button order, then two buttons possition side-by-side, cancel button now last