TASK 6: additional UI improvements.