updated plan
merge
adding base button for menu toggle, mild reorganization