Show the correct buttons for Insert/Update
Bring postgres code into line with mysql
Merge pull request #550 from timschofield/develop

Develop