Change some tags to simplify the css
Make look better on mobile