import event is in a better place
Merge pull request #24 from zachwhaley/ui-improvements

import event is in a better place
resolving conflicts