Began the process of fixing the 2D view