Cleaned front-end, added filter numbers