Re-enable timezone support
Fix inconsistent indenting in the ui view code