PR Changes. Also changed some shortcuts to more obvious combinations in menu.