moving about some styles to more appropriate places