Styling, underlines and content improvements