Improvements to profile layout.