move styles to stylesheet and tidy up