massive UI refactors