Added some forms in and some macros for creating forms and modals.