tidy up of bundle function to use asset server paths