Completed the layout

completed layout minus the circle
Circle is off center but in the view

put the circle in the view, off center, but in the view
i fixed my conflicts, i think