Correct paging
Code cleanup
Unncessary index
Slightly better alingment for portrait images