Update to leverage Interface builder in a more intended manner.