Closed #222
Improvements to page expand #159