Tidy up subject view

Tweak switched? Method