Shift divs about

Have a div for the top, then a div for the bottom, and split those into
two sets of things each.

Also some minor design changes.

Bug: 54789
Change-Id: I96cda7abbe6051903d2d8887ec3a31feaff39f59
Merge "Shift divs about"