Add keyboard shortcuts; Streamline preview