Merge pull request #122 from jhaybie/finalTouches

repositioned code for alertview
storyboard wins

or does it?
Merge pull request #123 from deebost/master

storyboard wins
minor fixes