Seprate data and time widget realted chagnes
Merge branch 'new_user_predefined_settings'