fixing up new ui