12 Commits (refactor/ui-updates)