Tidy up HTML and README further