Removed the choice picker from last commit. Changed DatePicker based on Android dev docs