#1 fixes, begining implementing calendar widget