refactored shapes in views