fixes on view item and listing page