reworking date navigation block to be less stupid