Refactored to style
added style for shape