Issue 35 fix all pages