Nat: changed templates to include kitchen and edited view shelves