Added item view and clean up codes