More menu and QS changes