Merge branch 'revise_profile_design' into base_design
Merge branch 'base_design' into develop
reverted design
squashed files.
squashed big commits.