Connor: Small changes to EditorActivity
Connor: Merged my files