Move Ok Cancel and Back to Dialog
Move Ok Cancel and Back to Dialog, from papel, rebased