Added SPControl and messed around with the layout