Adding custom error messages
* Style tweaks to match mock up