Initial clean up  of capture view and added use of import session.