add date picker and cleanup templates