Fix minor style/layout issues