GUI and minor changes

* Finished GUI in menu
* Tweaked some names in other files