Update the layout organization

This update reorganise the layout to regroup roles