modify ui by John Soh