Rework wizard buttons and move cancel right