Refactor and add device/day navigation