Merge "Layout codeitems based on profile data"