added current page tweaks