images and header bar
resolved conflict