fix js validation layout issues
minor merge conflict