Move arrow/distance views to header.  Still needs tweaking.