Finished UI Refactoring