touched up with current ui toolkit