More menu tweaks

* more menu tweaks
* remove old "Clouds" code