Rearranged layout