UI further improved