Build out UI architecture a little more.