better layout flow