Merge pull request #3 from AquaSlice/master

Cleaning Up Database and Methods
Merge pull request #5 from AquaSlice/master

Updated UI
Fixes for #7
Merge remote-tracking branch 'upstream/master'