Updates to TopBar and Page.ss