MNT: Refactor of 2D widget complete