fix diff
delete use of Category['is_leaf']
fix using PasswordHasher
fix layouts
fix layouts
fix layout