Refactoring & UI work