Some cleanup
Fixed focus problem for subject/to areas