Included more shortcuts and more textboxes