Refactored and extended vertical shapes