Improve dropddowns, fix initial selection of date