add fixes on margins