Improve CSS & JS includes in head template