Changes for the new layout.

Now all I need is to get the menu setup, and the big stuff will be good
to go!