Flattened HTML markup and Moved to 100% width content
Because of a previous change
Improved id support