Lots of buggy things now look nice