EHO-337 using the next week links shows the loading spinner
EHO-338 form guarded after week change
clean up of left-over guardform