Adjusted several shortcuts