12.16 update

UI finish