rough filtering added
url redirect
layout
Merge branch 'ui-2'