profile refactoring, ux fixes