Moved menu entry, some other improvements..