changed content page & added contents for 1st page
conflict :(