New Layout Bug fixed