New ToggleFocus directive, cleaned out old directives