Work on new ui layout