Improve gui, add filter buttons