Much better layout...still work on borders