changed output layout, app flow