No need to remove the menus unless in window system.
A bit of a merge.
Adding a new demo-ing system.