More visual changes and fixes.