Button focus

Several button focus fixes.