Bug fix in getNextShape(), getPrevShape()
Visibility changed.
Some improvements.