Some slight style and markup changes which look a lot nicer.