[Default skin] Screentweaks and code cleanup. More to follow.