Minor layout tweaks
Fix linking error