Done base UI

Missing commit