added buttons and icon
improved logging