added ability to draw shortcuts, updated dialogs