fix timezone bug and make design tweaks

Based on feedback from https://redpen.io/qz75766992e4b61df6#showing-comment-446003