fixed merge stuff
calendar not small
more tiny mege conflicts on app layout