fixing date layout issue on entry_ui
Merge branch 'develop' into feature/UPS-982