WallDecoration completely refactored