12.18 update

UI done