little refactor UI