Misc styling fixes