Cleaned up more of the layout