Update cavern, reuse grid classes, use full 'padding' in box model, remove 'lap-and-up'