one way and return layout improved