move new ui code to appropriate .c