Clean up building of study options fragment
Merge pull request #575 from timrae/cleanupStudyOptionsFragment

Clean up building of study options fragment