prepare 2.1-SNAPSHOT
optimize view hierarchy