Several screentweaks and code cleanup.
Several screentweaks and code cleanup.