Added some styles & fixed linting errors