Add form to stock management page, currently nonop
Fix rebase conflict