Few changes to profile templates