Change styles and fix bugs