lots of changes to implement filters and extra buttons
removed filter function - useing list for filter