restyle
some more