Continued work on account settings and forms