removed filter, added a couple of functions and some styles