Moved the config form properly this time... Fixed the promises on the forms