Cleaned up the layout