new asset form and some js cleanup, things may break
manual merge