Fixed some with styling and markup in general