working datepicker
better menu floating
datepicker
merged conflict