working on ux refactor