implemented new ui