Labels added to treatment view

Also some additional code tweaks