rearranged layout