Button title and flash message updated

Button title and flash message strings had been updated.
Flake updates ;)
Merge pull request #530 from psav/fix_pxe_test

Fix pxe test