Fixed recursive draw. Moved adapters to controls.