Con 1706

Please think how we can avoid adding markup only for styling.