Initial refactor of Challenge app views