Updated with Context Menu and Library Shortcuts