Fix ux

Fix requests from #1402