analysis templates UI corrections