Simplified existing layout some.