Cave layout improvements