Final fix including CSS before JS