Looks better

No big functional changes
Buildfix