Changed visibility of H5Location and H5Container to "package" + style fixes