minor style issues and left shortcut current marker