Layout improvements
CSS improvements