Main view and layout modififed