Finish DiffVew addition and some minor changes