ui fix
Revert "ui fix"

This reverts commit 5fcc342ff5dd5ebf23d9fae75d522dc75cd10862.
Revert "DateTime config"

This reverts commit 545c8bc01689f963e1a5780b372e5aa6faf3f5d3.
Merge remote-tracking branch 'origin/master'