added buttons
ui implementation
merge