Added macro to show stuff when a field is required, also moved another macro to macros.html