Fix scale and margin issues