Refactors, put back cell highlight, hud history buttons.