correctly concat and include js files
fix grid issue