Ticket #43: Fixed bug by adding checks within model
#43: Modified the error message to be shown
Ticket #43: Added styling fixes
Ticked #46: Solved bug
Merge pull request #196 from sdaityari/master

Fixed bugs: Tickets 43 and 46