updates to form and menu tab, ready for api