Fix some intendation errors, caused by menu code splitting.
Add missing noecho().