New Layout, minor bug fix