- Update menu option with mark name.
- Code clean up.