Nwe Layout
New Layout Bug fixed