fix timezone bug and make design tweaks
Merge pull request #1 from adamlofting/bugfixes

fix timezone bug and make design tweaks