Update the layout making it more semantic