Refactor CSS, bundle update