fix a couple of division by zero error
reorder menu options as requested