Adding Button

Change-Id: If1ac5008412394b37043e3140286246f4b369363
Changing Button

Change-Id: I33011eb3dece63d4cc8c442ec86253996b126a4d
More improvement

Change-Id: I17b90aa865d5b54199b11baa2299d40f5797d243