Updated Layout Again to match the tests, haven't pushed test changes, will come in next commit