Layout update

All pages working.
NB: use hard  coded int, because for some reason the framework doesn't
stop incrementing the page count when using R.integer or even a private
int.