Force the datepicker to always have a higher z-index than other elements, to make sure it doesn't end up behind a modal or similar.
Added some initial support for labels on the grid - still needs refinement though
Resolved merge conflicts