Made the user forms more modular.