updates and fixes to views