Filter by name; cleanup css; refactor