Updated layout in storyboard for better visualization.  Also resolved a constraint conflict