Add availability button to navigation bar
Fix updating reports so it actually works

- Also fix up some stuff from the merge