UI Refactoring and new controls