First testable version new layout