New structure and added back button to user form view.
Added new files
Fixed merged conflicts