[Default skin] More screentweaks and code cleanup; still more to follow.