More UI mock fixes and changes