Add final step and enhance UI.