fixed some ifs in new view
merged