Rearrange JS
Improve filter UI concept