Merge styles and fix name edit padding