mostly updated ui