Little changes on shortcuts, edit shortcut added