Add changes

Add changes to create custom buttons and move buttons to top right side.