fixed filters, added spinner, reorganized