Calendar and gui modified

Calendar and gui modified