changed menu and top bar to adjust for states