week & day view button
Fixed Conflicts