Small refactor to centralise active-ness
Back button
Merge pull request #3 from matthew-andrews/back

Small refactor to centralise active-ness