Manage: remember selected tab
Merge branch 'Adar'