layout and logic changes for new output