merge add/remove file views for app & yer #108