Some manual changes to make things look nicer.