Update and fix styles