Layout review + CS fixes + Small fixes