Cleaned the layout a little.