Cleaned up & optimized the layout.