updates to views, some minor cleanup