Step-4 UI completed