Updated to use responsive forms