refined UI codes
Merge pull request #86 from SupunS/master

Refined UI codes and structure