Fix headers + rest markup