diff --git a/Web/templates/admin/settings.html.ep b/Web/templates/admin/settings.html.ep
index b82d056..3c02ed5 100644
--- a/Web/templates/admin/settings.html.ep
+++ b/Web/templates/admin/settings.html.ep
@@ -2,26 +2,5 @@
%= include 'admin/_nav', page => 'settings'
-% if ( my $confirmation = flash 'confirmation' ) {
-
- <%== $confirmation %>
-
-% }
-
-% if ( $c->stash->{success} ) {
-
- <%= $c->stash->{success_message} %>
-
-% }
-
-% if ( $c->stash->{errors} ) {
-
- There were errors with your request that could not be resolved:
-
-% for my $error ( @{$c->stash->{errors}} ) {
- - <%= $error %>
-% }
-
-
-% }
+%= include '_base/status_window';
diff --git a/Web/templates/auth/forgot.html.ep b/Web/templates/auth/forgot.html.ep
index d6adac9..ab18767 100644
--- a/Web/templates/auth/forgot.html.ep
+++ b/Web/templates/auth/forgot.html.ep
@@ -1,35 +1,19 @@
% layout 'standard', title => 'Forgot Password', sb_active => 'forgot';
-
Reset Password
If you have forgotten the password for your account, please enter the email address below and you will get a link to reset your password.
-% if ( $c->stash->{success} ) {
-
- <%= $c->stash->{success_message} %>
-
-% }
-
-% if ( $c->stash->{errors} ) {
-
- There were errors with your request that could not be resolved:
-
-% for my $error ( @{$c->stash->{errors}} ) {
- - <%= $error %>
-% }
-
-
-% }
+%= include '_base/status_window';
-
+ <%= include '_base/form/input', type => 'email', name => 'email',
+ title => 'Email Address',
+ help => '',
+ value => $c->stash->{form_email}
+ %>
+
+
+
diff --git a/Web/templates/auth/login.html.ep b/Web/templates/auth/login.html.ep
index a6dd7b8..c30083b 100644
--- a/Web/templates/auth/login.html.ep
+++ b/Web/templates/auth/login.html.ep
@@ -2,31 +2,22 @@
Login
-% if ( $c->stash->{errors} ) {
-
- There were errors with your request that could not be resolved:
-
-% for my $error ( @{$c->stash->{errors}} ) {
- - <%= $error %>
-% }
-
-
-% }
+%= include '_base/status_window';
-
+ <%= include '_base/form/input', type => 'email', name => 'email',
+ title => 'Email Address',
+ help => '',
+ value => $c->stash->{form_email}
+ %>
+
+ <%= include '_base/form/input', type => 'password', name => 'password',
+ title => 'Password',
+ help => '',
+ value => $c->stash->{form_password}
+ %>
+
+
+
diff --git a/Web/templates/auth/register.html.ep b/Web/templates/auth/register.html.ep
index f0e7104..a26a897 100644
--- a/Web/templates/auth/register.html.ep
+++ b/Web/templates/auth/register.html.ep
@@ -1,45 +1,35 @@
% layout 'standard', title => 'Register', sb_active => 'register';
-
Create an account
-% if ( $c->stash->{errors} ) {
-
- There were errors with your request that could not be resolved:
-
-% for my $error ( @{$c->stash->{errors}} ) {
- - <%= $error %>
-% }
-
-
-% }
-
-
+%= include '_base/status_window';
+
+
diff --git a/Web/templates/auth/reset.html.ep b/Web/templates/auth/reset.html.ep
index 3de88a3..ecc1e44 100644
--- a/Web/templates/auth/reset.html.ep
+++ b/Web/templates/auth/reset.html.ep
@@ -2,37 +2,22 @@
Reset Password
-% if ( $c->stash->{success} ) {
-
- <%= $c->stash->{success_message} %>
-
-% }
+%= include '_base/status_window';
-% if ( $c->stash->{errors} ) {
-
- There were errors with your request that could not be resolved:
-
-% for my $error ( @{$c->stash->{errors}} ) {
- - <%= $error %>
-% }
-
-
-% }
+
+
+
diff --git a/Web/templates/blog/create.html.ep b/Web/templates/blog/create.html.ep
index d58f703..827223a 100644
--- a/Web/templates/blog/create.html.ep
+++ b/Web/templates/blog/create.html.ep
@@ -19,22 +19,7 @@
If you have your own domain, you can also use that. Be sure to set your DNS records to match *.<%= $c->config->{customer_domain} %>.
-% if ( $c->stash->{success} ) {
-
- <%= $c->stash->{success_message} %>
-
-% }
-
-% if ( $c->stash->{errors} ) {
-
- There were errors with your request that could not be resolved:
-
-% for my $error ( @{$c->stash->{errors}} ) {
- - <%= $error %>
-% }
-
-
-% }
+%= include '_base/status_window';