Fix top page & image display issues