[manager] Re-order form fields and labels
[manager] Refactor code.
[manager] Remove unused form.