Added Angular filters and improved js functions