Fixed CSS and JS merging errors