Modularization of master view