fixed AOE issue
reorganized profile layout