added filter, layout and more options