full infrastructure names in menu
proposal form: save draft, discard, submit buttons moved above the form