Fixed problem with small pages
Closed #60
Closed #59