Make sensor page work with new structure