Refactoring

DRY'd up our terminal view render functions