Added form layout changes and fixed responsive grid