Cleaned up the layout.