Filtering WIP
Rearranging GUi in preparation for new Filters