some updates and cleanups with the styles