Improves layout of filter form
Resolves merge conflict