Refactor to use fragment infrastructure; minSdkVersion dropped to 4