Moved shortcuts to the side, improved syntax