Updated menu and some user pages