Clean things up before refactoring prepareLayout.

TESTED=Ran App
Refactor out step 1 in prepareLayout

Also removed duplicate item width for section code.
TESTED=Ran App