Reworked the terminal display