Updated main module layout
Updated view list layout