Added some data validation and refactored the new styling


![](http://media.giphy.com/media/UHzoGMRqp4jCg/giphy.gif)