Add two-row display;
also remove auto-scale textview because of bugs... back on the todo list.