Fix top page & image display issues
Misc fix