Merge pull request #14 from Nurhashimah/master

Misc fixes for uniformity
Merge pull request #15 from Nurhashimah/master

Tree view for UNIT - uniformity
fix tree view in KITS & UNITS