Fixed page navigation display on main page
Merge branch 'master' into dashboard