Fixup styling and changes for push to couch.