Small improvements on CSS and HTML