js imports fix; main and application js have been merged;