Fix some style issues on menu functions.