Lots of styling
Moved logic out of Teach view and into the Teach control where it should have been.