Added alerts and styling