depreacated fixes and view improvements;