Styling fixes, and fixed package.json