Added new error message and more html!