Polished the layouts, need to add few more layouts