Fixed custom.js loading + other stuff