improved UI mock