dm UI refactor 90%