Fixed seg-fault and correct field/button highlight.