Major UI separation update

Please accept few commits on UI separation and bugfixes