Revert layout changes

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

Change-Id: I1594d84eb38c42f3ae2089c99b217fc83874ce6d