OP-1590 Fixed issues found in review.
OP-1590 Uncrustify
OP-1590 Fixed text
OP-1590 Fixed sub-menu names.