added .form's and #solution layouts