Merge pull request #19 from SupunS/master

Add UI buttons