#13 Fixed display locations in Provider UI