Adding below and above layers. Still buggy for pools and rounds.