adding videoview and a little cleanup