UX/UI updates ; refactoring edit pages