fixed filters, added spinner, reorganized
removed logging