updated storyboard with small changes and contraints