Fix up a few style/look issues