separated widgets as modules, added calendar and borderbox