Changed a few things around regarding layout.