Refactored elements; added beveled edges.