moved around some display code