Improve Configuration Menu and Configuration Menu.