Added short cut edit view
Added remove shortcut definition functionality
Added "add shortcut definition" functionality
Code cleanup