Fix some issues. Height of forms, and show some fields in modal