forms and buttons updated to more modular structure