Updated the shortcuts and ensured modal was removed when changing routes