Refactoring, custom filtry v treereader, priprava menu, ...