Move buttons to top of filter form

Addresses https://pm.theworkdept.com/issues/3904
Merge remote-tracking branch 'origin/master'