Finish Virtual Tour and Flashcard refactoring