Minor changes on shortcuts, added buffer close shortcut