Bugfixes and simple menu