Content Clean up and figure labelling

Labels were given to figures for cross referencing. Clean up of content
was also done.