Feature/201 dates admin

This PR also contains the commits for PR feature/200