Tidy up and simplify some positioning
Use donutSector instead of custom work