Added calander and updated news layout
Fixed conflicts