Modified edit form to add double columns, and moveved tags to general