add links to reservations and shifts, rename history to previous
merge conflicts resolved