Move some CSS around
Simplify package.json