fixed grunt copy; tidy up css and js;