Added merged JS and CSS