Clean up of Contract controller

Need to fix Port Groups so that they show up on the screen