Few modifications on Profile (not entirely fixed)