massive round of updates related to new UI