Clean up
Fix nav highlighting
Log/handle image fs errors
Uncomment booking validation