added filtering of file types, changed some logic, changed display labels