Remove layout, greatly improve internals.