Added storyboard logic
Convert to ARC
code style fixes