Revert layout changes

This reverts several commits that changed above/below-the-fold

Change-Id: Ic1c9d82ea8b4498004ab3530fd903f632c3d4a1b