Autolayout & Storyboards

These changes were necessary for use with auto layout  & storyboards.