Modularized the views