add basic waiting on page, tidy up hide until modal better date picker