Major layout modifications

It's starting to take some kind of shape...