Testing started. Fixing rendering form issues