Reorder storage nested tabs alphabetically
Fix initial selected tabs from system view