updated with latest main.js
updated css