More fixes to make things look nicer.
Even more fixes to make things look nicer.