10 Commits (ui-enhancement)