Margin and underscore fix