Added support for extending into the client area