Add grey container for form submit, minor tidy ups