fixed migration errors
made toolbar appear like magic
Merge pull request #15 from SpraggleRock/migration_bug_fix

Migration bug fix