Changed layouts

Signed-off-by: Anurag <anurag.pattnaik@andolasoft.com>