Layout changes and more routing configuration