Added filter and gird/list layout