[Default skin] Screentweaks and code cleanup