Layout issues (datatable filter field +++)
(cherry picked from commit 253edb9)
(cherry picked from commit 27fa89a)