I7: Edit profile section bugs fixed