Finished changes with laymode and page
Merge branch 'master' of https://github.com/punn/laymode
Adjustments to merge conflict