Fixed redraw bugs and added dropdown filter