ui cleanup, plus dune quotes