Fixing styles and errors