restore right button
improve focus
store data