Fix form issue
Small end changes