Update dropdown fix, config rearranged
Schema file removed, some more optimization
Merge