updated to filter buttons on layout