Intermediate commit

Some UI changes - timing needs to be explained more