changed layout for simplicity