Altered structure and added calendar picker