Forms packages managing
Change form to one ModalForm style
Some error resolving.