Updates, changes for 7th, improvements to layout.