Small UI changes for Eyewitness usage