APPWTV-9 simplification and splitting of Ui management classes