First commit in that branch
Fixed form visual bug