NVR-005:  More work on adding drawer layout...