[FEATUER] Updated default layout