FIxed view & added missing first row codes