Updating profile layout
Clean structure