add M shortcut, and fix some format issue