some beautification
use toLowerCase with Locale.ROOT
changed menu order