Updating with some layout changes.