Fix layout js reference
Fix null input for select
Preferred names