changed layouts
sort and filter functions changed