updated ui and cir formatting to match all.