Fixed the layout and other stuff.