First draft
Adjustments
Add ChangeMenuItem/MakeCursor helpers
Fix main page
Fixes