Redesign terminal outputs