Align (show more fields). Add control styles to the wysiwyg textarea
Merging conflicts