Set margin instead of leaving it as a TODO