Minor fixes and profile is auto populated