Add quick command & improve keyboard behavior