Update misplaced views
Enable conditional resource bundle support
Explicitly set indentation to spaces
Add ability to show/hide "Now" button