Improve the logic for make files
Disable CSS and JS aggregation