additional filtering added, improved styling a bit
Reworked a bunch of files