"Fixed" calendar widget and added some more fields