Restructure
Add menu settings