Stylesheet updates
Merge remote-tracking branch 'origin/filling-in-layout'