cleaning up page
Merge branch 'master' into clean-tests