Fix the fill button vertical position. See #24
Reordered the node addition to ensure watershape is behind the tank frame and made the watershape occupy full tank width. See #27