Styling changes + more semantic markup