PR changes.

refactoring view

Add HBTM
remove valid