Design changes and make partials for error messages