Added Categories page and better navigation