fix month picker issue and deffine association
minor view changes
remove conflicts