UI Enhancements & User Refactoring