Final Draft

Removed Checkboxes, removed "no filter button", general cleanup.