Fixing merge conflicts

Also added focus to shown tabpanel