Added default module views and little changes