Fix margins + rewrite the example + rebuild