Improved how views are constructed making the code more modular.