Tidy of form the great commit wars of 2014

Readded SavedInstanceState
Readded Course Detail listeners.