Added search box and keyboard shortcut support