Additional UI fixes, and bug fix regarding filter