added key
update button ui
update ui
Merge pull request #1 from Awesomez/master

update from master