Some fixes + Add menu clicker