Rework of menu to show current page