UI work and added ESC trigger to filtering