Jcarrion/new ui