[IMPROVEMENT] add navigation between pages in layout

fix some text displays