fixes on view item and minor changes