Some more reordering in credentials view