Merge changes If4e8ff72,I53d861fb

* changes:
  Add data table for build library.
  Fix few UI bugs.