Added items page & some minor fixes