Refactored app a bit to get cleaned up, still need to try to make it update current shapes on a change instead of just redrawing a whole new view