Fix 2

Fixed some display problems.