continued implementing the new layout. All tests passing except for that last weird cucumber test.