Working on Hitlist display & more code cleanup