Improvement to bootstrap second layer, now automatically add 'form-control' into class, when appropriate.