profile redesign and editing almost done
merged conflicts between Ricky and Leo's changes