Fixed single-page screens for #81
Finished multi-page screens for #81