changed style/fonts and cleanup