Cleaned up the layout a little bit and got things closer to ready to do something with.