1

My suggestions are simple and self explanatory !

2

Some menus have been reworked already…