Fix issue with forms rendering