UI completed. Tested OK.