Changed UI-BE architecture