cleanup ui & bring back ui_2.0 concepts