Started fixing active page issue