Pass at fixing display issues.
Fixed upgrade script.