Dev005

-Edit layout