minor changes on master
TODO: Add modal for editing in Booling/show view