Reorganize macros into separate component files

Replace a few old UI Module instances with  macros

templates/requests/screen-5.html

@@ -1,5 +1,7 @@
 {% extends '../requests_new.html.to' %}
 
+{% from "components/alert.html" import Alert %}
+
 {% block form %}
 
 {% if f.errors %}