Several screentweaks and code cleanup.