further improved UI