Now that we can use margins from css for this, remove the margins we set in code and use css instead.