Misc fixes and updates

# Not Ready

* Added bean as a dependency as there are a number of views that include it