#877 Update styles with max-width
Remove some tags