exclude leaves
Add role and current project allocation
fix layout