Added margin setting