#879 fixed some minor layout and shortcut issues
#879 fix some keyboard binding issues