UI Overhaul and Filtering Works, now to clean it up