[#43416889] Adjust various styles that were thrown off by merges

![](http://content.screencast.com/users/loganbfisher/folders/Jing/media/7935bdbe-f3b8-4860-9041-07bb1c860ef1/00000355.png)