Bug correction

* Menu now working again
* App close working