added ui parts
Merge branch 'pande'