Code Clean Up..
Fixed Contraints in ViewControllers