Finished updating Flashcards and Docking to better match template, though cleanup is in order, Issue #1