Added layered, vertical, and norizontal shapes
Added functionality to decorator classes