Tidying up of the context menu + make move-to-end multicast...