Bugfixes

Minor fixes to Datepicker and Menubuilder