working on the new ui