Merge pull request #401 from fahadhatib/develop

Develop
Bring new script into line with coding guidelines
Show buttons correctly on the confirm dialogs
Give the form element a name to correctly work with testing suite
Show the bullet points correctly in the menu structure
Properly style the buttons in the confirm dialog boxes
Merge pull request #402 from timschofield/develop

Develop