Add cert widget binding; clean up excess enum usage