This should be mostly solved by the PR proposed for XWIKI-21910. There'd be the layout menu dropdown left in here, now I think this part might need another feature (maybe a toggle parameter for the livedata macro to desactivate it).
Or maybe we consider that just the dropdown button left is okay and close this issue as fixedby XWIKI-21910