first commit of next-gen UI