Re-arranged some html, tidied up style