Right panel + some fixes of calendar