Various display tweaks and fixes.