Added new shortcuts and made a few Ui changes