Surveyor UI mostly completed