Fix and move 'cancel' to right place