Layout rearranged