Updated to use basic DWS API, additional layout usage.