Fixes - Terminal View #76