Moved some options around (to different flyouts)
minor layout modifications