fixed merge conflicts from new UI
merging trivial conflicts
started writing click handler
Merge pull request #12 from brain-murphy/brian-branch

Brian branch
changed color, changed styling
added database storage for enablement
remove serialization
 merge
Merge pull request #13 from brain-murphy/connorbranch

Connorbranch
merged
merging
merging and style changes
selection and such. Highlighting.
merging