profile/dashboard updates && states fixes