Reorganized settings and add a menu