Fixed Mockups

Hopefully restored mockups to the state before Caleb messed them up.