merged with new .css and updated .js