Change some strings and re-arange them for profile views