CHECKPOINT pre UI/UX overhaul
