Rearranging for better layout