Cleaned up the design a bit and got the UI to correctly update the rendering