fixes and view-activity view improvements