Add a bit of formatting and some on hover, focus