Changed styling of filters; re-factored to use scope methods