Style changes

[#318](https://meta.trac.wordpress.org/ticket/318)
[#319](https://meta.trac.wordpress.org/ticket/319)